Merge pull request #143 from gpsbabel/fix_bad_merge
authorGPSBabel <gpsbabel@users.noreply.github.com>
Wed, 6 Dec 2017 22:29:19 +0000 (16:29 -0600)
committerGitHub <noreply@github.com>
Wed, 6 Dec 2017 22:29:19 +0000 (16:29 -0600)
commitd98b8f9706444d9b18a584f2fd9e69ce2c79fe07
treeb2c620cd4a399d7d348e8526c46631e603a8862d
parent129cbf6f480b34ed1e233cd78bcf5cb5d55d51c1
parentcbaa069f8d74b6aa85b5e3d279477807b5960c9f
Merge pull request #143 from gpsbabel/fix_bad_merge

Fix a bad merge base in PR 126. Only main.cc seems to be affected.